auto merge of #109 : steveklabnik/cargo/json, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 2 Jul 2014 00:00:00 +0000 (00:00 +0000)
committerbors <bors@rust-lang.org>
Wed, 2 Jul 2014 00:00:00 +0000 (00:00 +0000)

Trivial merge